Merge branch 'master' into cleanups

diff --cc csv_util.cc
Simple merge

diff --cc vecs.cc
index 0f5fb864ec965ff46acae9455e34f40fe637c496,4c4a947f5bd334a0a130ef48f3dcec21a3a9c4d3..f04bfd74dbb77bbea66fbed679b2ae3e35f66739
--- 1/vecs.cc
--- 2/vecs.cc
+++ b/vecs.cc
@@@ -1547,8 -1539,8 +1539,8 @@@ disp_vecs(
      if (svp[i]->vec->type == ff_type_internal)  {
        continue;
      }
 -    printf(VEC_FMT, svp[i]->name, svp[i]->desc);
 +    printf(VEC_FMT, svp[i]->name, CSTR(svp[i]->desc));
-     for (ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
+     for (auto ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
        if (!(ap->argtype & ARGTYPE_HIDDEN))
          printf("        %-18.18s    %s%-.50s %s\n",
                 ap->argstring,
@@@ -1575,8 -1564,8 +1564,9 @@@ disp_vec(const char* vecname
      if (case_ignore_strcmp(svp[i]->name, vecname))  {
        continue;
      }
 -    printf(VEC_FMT, svp[i]->name, svp[i]->desc);
++
 +    printf(VEC_FMT, svp[i]->name, CSTR(svp[i]->desc));
-     for (ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
+     for (auto ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
        if (!(ap->argtype & ARGTYPE_HIDDEN))
          printf("        %-18.18s    %s%-.50s %s\n",
                 ap->argstring,

diff --cc xcsv.cc
Simple merge